Merge pull request #70 from where2night/Adrian

close #68 close #69, friends
Where2NightDev update
Sync