Updated framework to master 0.2 beta.
Merge pull request #133 from teotigraphix/master

Updated framework to master 0.2 beta.