Merge pull request #1 from chanchalmusic/dev

Dev
Merge pull request #2 from chanchalmusic/dev

current target
stashed from dev, popped from master
Merge branch 'master' into dev