Update 18.07.2013

Started second prototype revision, basicaly I am currently doing a
rewrite based on old code and knowledge gained from that to make
something more managable and better.