updated implementation
Merge branch 'master' of github.com:hotnAny/2013Fall