amygdalama Merge pull request #2 from sevas/master