Merge pull request #1 from kaveh82/master

learning to commit
WIP
Extras