last minute changes
Merge pull request #27 from DomiENG/master

last minute changes