Minimized file up to merged pull request #11