Merge pull request #4 from Imperatus/develop

Feature complete 0.3a
Changed labels