Merge pull request #3 from disjukr/master

Machine 포팅
Merge branch 'master' of github.com:agemor/elsa
lots of changes
Merge remote-tracking branch 'origin/master'