Merge pull request #17 from jrahm/master

aweh
DONE
Fixed Final
got compilign