Merge pull request #308 from gizmo98/master

Minor improvements
linapple: use gcc 4.6
Merge pull request #1 from gizmo98/patch-1

Patch 1