binux Merge pull request #150 from eroamane/patch-1