Fixes #182, Fixes#183
Merge branch 'master' of github.com:i4004/AcspNet