Fixed issue #2
Merge pull request #18 from SDS-MIT/master

Fixed issue #2