Fix for #133 #128 #127
minor fix
Merge pull request #148 from Gizra/127

Fix for #133 #128 #127