Initial commit
Unit testing
Merge branch '0.1.environment' into 0.1