Added some stuff
Merge branch 'master' of github.com:shahidhk/andromeda-server