closes #133
Merge pull request #135 from xrotwang/issue133

closes #133