Merge branch 'dev' of github.com:dorafmon/PE into dev
working, but not very well