Merge pull request #132 from teotigraphix/master

Fixed Issue #129 and Issue #131
Updated framework to master 0.2 beta.