Merge pull request #9 from bigeagle/master

Bug Fix
..
..
fix untestable bug