Fixed #137, Fixed issues based on Customer Feedback