Version 0.2 released
Merged with remote repo