fex changes
Merge pull request #11 from ProjectAlly/master

few updates