Fixed bugs in initial implementation
0.6.1