Merge pull request #6 from farz4d/master

farzad
param
enterConditions
shape2d
Merge remote-tracking branch 'upstream/master'