Initial commit 0.6.1