updates
Merge pull request #2 from ProjectAlly/master

new updates