Fixed [Issue#48]