Merge pull request #17 from vokal-isaac/master

Subspecs & Repo Reorg