Merge pull request #12 from wick-ed/master

moved away from magic __get/__set/__call + minor bugfixes
bugfix: incompatible overridden method + minor cleanup