Merge to master for tagging 0.0.1

@brutski Please merge.