Pulling changes from issue#123