Merge pull request #3 from ipri2013/master

Update files.
Requirements fix.
Merge pull request #28 from byteme/master

Requirements fix.