Merge branch 'dev'
Bumped version numbers to 0.10.4
Merge branch 'master' into dev