closes#36
Merge pull request #61 from rhsu/issue36

closes#36