Now Finally!

OK, done. done. Done!
Merge pull request #16 from YenaHong/patch-1

Now Finally!