Merge pull request #2 from neoxygen/0.4

merged 0.4
Merge pull request #3 from neoxygen/0.4

[TestSuite]