Merge pull request #55 from rolies106/master

Fix minor issue from previous "adding something new"
Remove location from model and put back js modified by @rizarsyi