#27 #19
Merge pull request #35 from visminer/issue-27

#27 #19