Added the improvements suggested by Anna

http://jira.cheggnet.com/browse/MS-5117?focusedCommentId=217217&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-217217
Updated build