Merge branch 'master' of https://github.com/shane-peiris/JavaApplication1