Merge pull request #15 from fortegente/master

#3 the first commit
#2 #3 #4 Add changes to all files.
#3 #4 #2 Changed user email
#3 pull from upstream