hooked everything together
Merge pull request #4 from jupamedig/master

hooked everything together