Basic functionality completed
Merge origin/master
Basic functionality completed