Merge pull request #3 from kaiprt/master

@kaiprt merging wireframes!