Merge to master for tagging 0.0.2

@brutski Please merge.