Merge pull request #453 from DJScias/dev-0.3

The if statement needs to be put in the function that is called in the a...