Merge pull request #1 from ajile/master

Some