Castle boundary check
Merge branch 'master' of https://github.com/abhinavsingh89/app