fixed Ahmad's compile errors
Merge pull request #18 from ZackAlfakir/master

fixed Ahmad's compile errors