rewritten some parsing functions because i think they were too ugly :)
much cleaner / more general now
function rewrite
removed no longer needed functions and their unit tests
Merge pull request #3 from bonkzwonil/experimental

Experimental