Fixed Issue#30
Merge branch 'iss30'