modified classes
Merge pull request #61 from sacjaya/master

modified classes