Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge pull request #366 from akash/master

merge