Merge branch 'master' of https://github.com/anidev/612-2013

Conflicts:
	ports.cpp
Merge branch 'master' of https://github.com/anidev/612-2013

Conflicts:
	ports.cpp
Merge branch 'master' of https://github.com/anidev/612-2013
Minor Changes
Minor Change
Merge branch 'master' of https://github.com/anidev/612-2013

Conflicts:
	ports.cpp
Merge pull request #68 from JeffTolbert/master

Minor Changes with big impacts