Fixed GCC Warning, should close #16