fixes
Merge pull request #22 from arminakvn/design

More description next time, please! ^^;
Merge branch 'design' into stage