! closes #1
Merge pull request #2 from connyay/master

! closes #1