Commit 93566d15ba1697c62d29f8b2253ae61259b9cbb4

kanoi 2014-07-04T14:08:32

Merge pull request #622 from kanoi/master MInion and Icarus changes