Parse input point properly
Merge branch 'master' into production