Merge pull request #11 from altaris-dev/master

Remerging commits from master