Merge remote-tracking branch 'fork/master'
Remove under and Fix apach bug
Merge pull request #81 from AliGH/master

Remove Under and Fix apach bug