Bug fixes
Merge pull request #30 from mshamash/master

Bug fixes (label bug)