bumped version #
Merge branch 'dev'
merged dev into master
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
release 0.6
Merge branch 'dev'
merged version bump from dev