changes made per issue #1

My first commit. Now mergin